Skip to content

merge queue: embarking 2.28-maintenance (cae5086), #13609, #13593, #13647, #13634, #13611, #13645, #13625, #13617, #13581, #13649 and [#13601 + #13604 + #13632 + #13627 + #13636] together#13669

Closed
mergify[bot] wants to merge 32 commits into2.28-maintenancefrom
mergify/merge-queue/8d3714b63d
Closed

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jul 30, 2025 •
edited
Loading

🎉 This combination of pull requests has been checked successfully and will be merged soon. 🎉

Branch 2.28-maintenance (cae5086), #13609, #13593, #13647, #13634, #13611, #13645, #13625, #13617, #13581, #13649 and [#13601 + #13604 + #13632 + #13627 + #13636] are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of [#13601 + #13604 + #13632 + #13627 + #13636].
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue default for merge:

  • check-success=installer test on macos
  • check-success=installer test on ubuntu
  • check-success=tests on macos
  • check-success=tests on ubuntu
  • check-success=vm_tests
  • any of [🛡 GitHub branch protection]:
    • check-success = installer test on macos
    • check-neutral = installer test on macos
    • check-skipped = installer test on macos
  • any of [🛡 GitHub branch protection]:
    • check-success = installer test on ubuntu
    • check-neutral = installer test on ubuntu
    • check-skipped = installer test on ubuntu
  • any of [🛡 GitHub branch protection]:
    • check-success = tests on macos
    • check-neutral = tests on macos
    • check-skipped = tests on macos
  • any of [🛡 GitHub branch protection]:
    • check-success = tests on ubuntu
    • check-neutral = tests on ubuntu
    • check-skipped = tests on ubuntu

Required conditions to stay in the queue:

---
checking_base_sha: 8d7dd7ed3c3e7cfa636e1a1a95c8e657d2df3d52
previous_failed_batches: []
pull_requests:
  - number: 13601
  - number: 13604
  - number: 13632
  - number: 13627
  - number: 13636
...

pbsds and others added 30 commits July 30, 2025 11:53
@pbsds @mergify
docs: fix duplicate anchor
1e371c4 
`#deriving-path-encoding` is defined in two places, I _think_ this is the correct one to change.

(cherry picked from commit 4c50cf7)
@xokdvium @mergify
export/meson: Don't require -std=c++2a for -c libraries in .pc files
354d4c4 
(cherry picked from commit d8da8f0)
@zimbatm @mergify
nix flake archive: add --no-check-sigs option
e04004e 
Allows to copy the archive to a remote host and not get

    error: cannot add path '/nix/store/01x2k4nlxcpyd85nnr0b9gm89rm8ff4x-source' because it lacks a signature by a trusted key

(cherry picked from commit 80a4293)
@xokdvium @mergify
tests/functional: Add more language tests for builtins.match
8f5e9b3 
These tests have been collected from nixpkgs f870c6ccc8951fc48aeb293cf3e98ade6ac42668
usage of builtins.match for x86_64-linux eval system. At most 2 matching and
non-matching cases are included for each encountered regex. This should
hopefully add more confidence when possibly trying to switch the regex implementation
in the future.

(cherry picked from commit d555d6b)
@fzakaria @mergify
Overriding gtest with gmock
59da02d 
How did this work before...

* Added .direnv/ to gitignore

(cherry picked from commit 58e34a2)
@donottellmetonottellyou @mergify
add documentation of tarball-ttl to nix-channel
b320aa5 
(cherry picked from commit 6badd21)
@donottellmetonottellyou @fricklerhandwerk @mergify
remove overly verbose mention of fetchTarball
ab3ad12 
Co-authored-by: Valentin Gagarin <valentin@gagarin.work>
(cherry picked from commit 633d391)
@donottellmetonottellyou @fricklerhandwerk @mergify
add reference to the tarball-ttl documentation
aace3d9 
Co-authored-by: Valentin Gagarin <valentin@gagarin.work>
(cherry picked from commit c0ceaa2)
@poperigby @mergify
Modify docker.nix to use mapAttrsToList instead of mapAttrsFlatten
556b71d 
The latter alias is deprecated in favor of the former, and produces a
warning.

(cherry picked from commit cfc15d6)
@lucperkins @mergify
Fix broken link in configuration description
f97ff25 
(cherry picked from commit 525078c)
@drupol @mergify
docker: make sure nix config check works
ffe384b 
(cherry picked from commit 57c72de)
@xokdvium @mergify
libexpr: Remove non-const overload of listElems
4f105e7 
This overload isn't actually necessary anywhere and
doesn't make much sense. The pointers to `Value`s are
themselves const, but the `Value`s are mutable.
A non-const member function implies that the object itself
can be modified but this doesn't make much sense considering
the return type: `Value * const * `, which is a pointer
to a constant array of pointers to mutable values.

(cherry picked from commit 7b46eb9)
@jayeshv @mergify
Fix a minor typo
cac6cfe 
(cherry picked from commit 699db04)
@wolfgangwalther @mergify
libstore: fix race condition when creating state directories
e52fe2c 
Running parallel nix in nix can lead to multiple instances trying to
create the state directories and failing on the `createSymlink` step,
because the link already exists.

`replaceSymlink` is already idempotent, so let's use that.

Resolves #2706

(cherry picked from commit d64c922)
@synalice @mergify
Update docs
66a5d4c 
(cherry picked from commit 785f386)
@egorkonovalov @mergify
Fix link
01963be 
Remove extra `realise`

(cherry picked from commit df21f24)
@xokdvium @mergify
libstore-tests: Don't leak memory in tests
9af1782 
We shouldn't leak memory in unit tests in order
to make enabling ASAN easier.

(cherry picked from commit 55d12df)
@mergify
Merge of #13609
3971991
@mergify
Merge of #13593
f14f426
@mergify
Merge of #13647
d9f9862
@mergify
Merge of #13634
b5d34b1
@mergify
Merge of #13611
7454a59
@mergify
Merge of #13645
9f07946
@mergify
Merge of #13625
10a0413
@mergify
Merge of #13617
95e6751
@mergify
Merge of #13581
a59c53a
@mergify
Merge of #13649
8d7dd7e
@mergify
Merge of #13601
fcc6f1f
@mergify
Merge of #13604
efc1174
@mergify
Merge of #13632
5506f5e
@github-actions github-actions bot added documentation new-cli Relating to the "nix" command with-tests Issues related to testing. PRs with tests have some priority store Issues and pull requests concerning the Nix store c api Nix as a C library with a stable interface labels Jul 30, 2025
@mergify mergify bot closed this Jul 31, 2025
@mergify mergify bot deleted the mergify/merge-queue/8d3714b63d branch July 31, 2025 03:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314 Ericson2314 will be requested when the pull request is marked ready for review Ericson2314 is a code owner

@edolstra edolstra Awaiting requested review from edolstra edolstra will be requested when the pull request is marked ready for review edolstra is a code owner

Assignees

No one assigned

Labels

c api Nix as a C library with a stable interface documentation new-cli Relating to the "nix" command store Issues and pull requests concerning the Nix store with-tests Issues related to testing. PRs with tests have some priority

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.